Signed Bundle wizard polish set a default targetType polish ChooseBundleOrApkStep.form on vertical growth polish KeystoreStep.form on vertical growth invoked the correct GoTo task for bundle Fixes: 78119367 Test: covered by existing tests Change-Id: I1fa52fc5744259289dc895bc38432b9c32c27802
diff --git a/android/src/com/android/tools/idea/gradle/actions/GoToBundleLocationTask.java b/android/src/com/android/tools/idea/gradle/actions/GoToBundleLocationTask.java index 2c12e0a..4b6c6b3 100644 --- a/android/src/com/android/tools/idea/gradle/actions/GoToBundleLocationTask.java +++ b/android/src/com/android/tools/idea/gradle/actions/GoToBundleLocationTask.java
@@ -55,6 +55,10 @@ this(project, notificationTitle, modules, null); } + public GoToBundleLocationTask(@NotNull Project project, @NotNull Map<Module, File> modulesAndBundlePaths, @NotNull String notificationTitle) { + this(project, notificationTitle, null, modulesAndBundlePaths); + } + @VisibleForTesting GoToBundleLocationTask(@NotNull Project project, @NotNull String notificationTitle, diff --git a/android/src/org/jetbrains/android/exportSignedPackage/ChooseBundleOrApkStep.form b/android/src/org/jetbrains/android/exportSignedPackage/ChooseBundleOrApkStep.form index 6f45863..7b50187 100644 --- a/android/src/org/jetbrains/android/exportSignedPackage/ChooseBundleOrApkStep.form +++ b/android/src/org/jetbrains/android/exportSignedPackage/ChooseBundleOrApkStep.form
@@ -36,7 +36,7 @@ </component> <component id="5b730" class="com.intellij.ui.HyperlinkLabel" binding="myLearnMoreLink"> <constraints> - <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/> + <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/> </constraints> <properties> <visible value="true"/> @@ -44,17 +44,10 @@ </component> </children> </grid> - <vspacer id="bdbd2"> - <constraints> - <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"> - <preferred-size width="-1" height="2"/> - </grid> - </constraints> - </vspacer> <grid id="4649b" binding="myApkPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> - <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> </constraints> <properties/> <border type="none"/> @@ -78,6 +71,13 @@ </component> </children> </grid> + <vspacer id="bdbd2"> + <constraints> + <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"> + <preferred-size width="-1" height="2"/> + </grid> + </constraints> + </vspacer> </children> </grid> <buttonGroups>
diff --git a/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizard.java b/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizard.java index a696daa..a936412 100644 --- a/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizard.java +++ b/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizard.java
@@ -21,6 +21,7 @@ import com.android.builder.model.Variant; import com.android.sdklib.BuildToolInfo; import com.android.tools.idea.gradle.actions.GoToApkLocationTask; +import com.android.tools.idea.gradle.actions.GoToBundleLocationTask; import com.android.tools.idea.gradle.project.build.invoker.GradleBuildInvoker; import com.android.tools.idea.gradle.project.build.invoker.GradleTaskFinder; import com.android.tools.idea.gradle.project.facet.gradle.GradleFacet; @@ -96,7 +97,7 @@ private String myApkPath; private boolean myV1Signature; private boolean myV2Signature; - private String myTargetType; + @NotNull private String myTargetType = APK; // build type, list of flavors and gradle signing info are valid only for Gradle projects private String myBuildType; @@ -194,7 +195,7 @@ } // should have been set by previous steps - if (myBuildType == null || myFlavors == null || myTargetType == null) { + if (myBuildType == null || myFlavors == null) { getLog().error("Unable to find required information. Please check the previous steps are completed."); return; } @@ -218,7 +219,11 @@ assert myProject != null; GradleBuildInvoker gradleBuildInvoker = GradleBuildInvoker.getInstance(myProject); - gradleBuildInvoker.add(new GoToApkLocationTask(appModulesToOutputs, "Generate Signed APK")); + if (myTargetType.equals(BUNDLE)) { + gradleBuildInvoker.add(new GoToBundleLocationTask(myProject, appModulesToOutputs, "Generate Signed Bundle")); + } else { + gradleBuildInvoker.add(new GoToApkLocationTask(appModulesToOutputs, "Generate Signed APK")); + } gradleBuildInvoker.executeTasks(new File(rootProjectPath), gradleTasks, projectProperties); if (myExportPrivateKey) { @@ -431,6 +436,7 @@ myTargetType = targetType; } + @NotNull public String getTargetType() { return myTargetType; } diff --git a/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.form b/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.form index 4c15925..7576d78 100644 --- a/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.form +++ b/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.form
@@ -33,11 +33,6 @@ </constraints> <properties/> </component> - <vspacer id="3b85b"> - <constraints> - <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> - </constraints> - </vspacer> <component id="825b8" class="com.intellij.ui.components.JBLabel" binding="myKeyStorePathLabel"> <constraints> <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> @@ -107,7 +102,7 @@ <grid id="fbf5b" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> - <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> </constraints> <properties/> <border type="none"> @@ -170,7 +165,7 @@ <grid id="c6e92" binding="myGradlePanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> - <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> </constraints> <properties> <enabled value="false"/>
